From: Raspbian automatic forward porter Date: Sat, 4 Apr 2026 19:49:37 +0000 (+0100) Subject: Merge version 4:26.2.0-1+rpi1 and 4:26.2.2.2-3 to produce 4:26.2.2.2-3+rpi1 X-Git-Tag: archive/raspbian/4%26.2.2.2-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:tmurad%40gmail.com//%22mailto:i18n-csb%40linuxcsb.org/%22/%22http:/www.example.com/%22mailto:tmurad%40gmail.com/%22mailto:i18n-csb%40linuxcsb.org/%22?a=commitdiff_plain;h=3e5a5e2c4c0c3434a487ab87e02b12fa7be5fcb6;p=libreoffice.git Merge version 4:26.2.0-1+rpi1 and 4:26.2.2.2-3 to produce 4:26.2.2.2-3+rpi1 --- 3e5a5e2c4c0c3434a487ab87e02b12fa7be5fcb6 diff --cc debian/changelog index ea993986697,77edd8a6cfb..719b068e92b --- a/debian/changelog +++ b/debian/changelog @@@ -1,19 -1,120 +1,137 @@@ - libreoffice (4:26.2.0-1+rpi1) forky-staging; urgency=medium ++libreoffice (4:26.2.2.2-3+rpi1) forky-staging; urgency=medium + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green] + * Use clang 11, newer versions cause armv7 contamination issues. + + [changes introduced in 4:24.2.5-1+rpi1 by Peter Michael Green] + * Build with gcc rather than clang. + * Disable skia. + - -- Peter Michael Green Thu, 19 Feb 2026 22:06:02 +0000 ++ -- Raspbian forward porter Sat, 04 Apr 2026 19:49:33 +0000 ++ + libreoffice (4:26.2.2.2-3) unstable; urgency=medium + + * 26.2.2 rc2 == final + + * upload to unstable + + * debian/patches/gcc16.diff: fix configure.ac for gcc 16 builds + + * debian/rules: + - since we differentiate on parquet now anyway in the filter config, + also bump Build-Depends liborcus-dev (>= 0.21.0-5). Also add + Recommends: on an liborcus-0.21-0 >= 0.21.0-5) built with parquet + support on those architectures to libreoffice-calc/-calc-nogui + * debian/tests/control: also regen debian/tests/control with + java-common 0.77 + + -- Rene Engelhard Wed, 25 Mar 2026 21:39:29 +0100 + + libreoffice (4:26.2.2.2-2) experimental; urgency=medium + + * debian/patches/gcc16.diff: backport #include additions from + master to fix build with gcc 16 + * debian/patches/parquet-filter-config-only-if-enabled-in-orcus.diff: + as name says + + * debian/rules: remove application/vnd.apache.parquet from + libreoffice-calc.desktop if liborcus is built without parquet support + + -- Rene Engelhard Mon, 23 Mar 2026 07:18:24 +0100 + + libreoffice (4:26.2.2.2-1) experimental; urgency=medium + + * New upstream release candidate (26.2.2 rc2) + + * debian/patches/use-correct-adfko-command.diff: backport from master + + * debian/watch*: remove Version-Constraint: same due to it not working; + while at it use more @PACKAGE@ and @COMPONENT@ where applicable + * debian/control: regen control with java-common 0.77 to remove some more + kfreebsd-*/powerpc lintian errors + + -- Rene Engelhard Thu, 19 Mar 2026 22:38:13 +0100 + + libreoffice (4:26.2.2.1-2) experimental; urgency=medium + + * debian/test-rust_uno-example: oops, actually move ... + * debian/test-rust-uno-example: ... here after rename in tests/control + in the last upload + + -- Rene Engelhard Sun, 08 Mar 2026 08:51:53 +0100 + + libreoffice (4:26.2.2.1-1) experimental; urgency=medium + + * New upstream release candidate (26.2.2 rc1) + + * change Debian package version to include the complete (internal) version + (as e.g. Fedora and Gentoo and openSUSE do already) to make debian/watch + work correctly with (stable) releases (to be able to find/display *and* + download the *correct* _published_ one at all times) and rcs with + https://orig-check.debian.net/upstream2orig/ in mind, also use full + alpha/beta versions (see below) + + * debian/watch.rcs, debian/watch.alpha-and-betas: split watch files + * debian/watch: make symlink + * debian/watch/*: + - update to v5 + - run (own) uupdate-component-tarballs.sh to repack help/translations + * debian/scripts/fix_component_tarballs.sh: rename ... + * debian/scripts/uupdate-component-tarballs.sh: ... to this + * debian/watch.rcs: watch libreoffice-aa.b.c.d completely so that + we are able to get the upstream tarball correctly (see above); use + http://downloadarchive.documentfoundation.org/@PACKAGE@/old//src/ + which despite the name also gets uptodate releases/rcs (thanks cacin) to + avoid pointing to dev-builds.libreoffice.org + * debian/watch.alpha-and-betas: watch libreoffice-aa.b.c.0.(alpha|beta)d; + as above + * debian/rules: + - stop calling debian/scripts/fix_component_tarballs.sh in + get-orig-source, uscan now does it properly for us + - stop build-depending on libcrypt-dev, we don't (explicitly) need it + anymore since 26.2.1 rc2 + - reverse logic for testsuite-only build-deps, shortening it (effectively + making them [amd64 arm64] + * debian/rules, debian/vars.{kfreebsd-*,powerpcspe}: remove kfreebsd-* and + powerpcspe here completely, dpkg dropped support and each mention of it + in b-d !conditionals causes a lintian error... + * debian/control.in: + - add Breaks: libreoffice-texmaths (<< 0.52.5~) to libreoffice-writer and + Breaks: libreoffice-texmaths (<< 0.52.6~) to -impress and -draw. See + #1128570 + + -- Rene Engelhard Fri, 06 Mar 2026 22:02:42 +0100 + + libreoffice (4:26.2.1-1) unstable; urgency=medium + + * LibeOffice 26.2.1 final release (identical to rc2) + + * upload to unstable + + -- Rene Engelhard Sun, 22 Feb 2026 10:41:41 +0100 + + libreoffice (4:26.2.1~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - revert "(temporarily) disable zxing on loong64"; now available + * debian/copyright: + - mention helpcontent2/help3xsl/flexsearch*.js + + -- Rene Engelhard Fri, 06 Feb 2026 17:20:45 +0100 + + libreoffice (4:26.2.1~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + -- Rene Engelhard Fri, 06 Feb 2026 01:28:05 +0100 libreoffice (4:26.2.0-1) unstable; urgency=medium diff --cc debian/control index 75c0b85ccf7,f51e739c3fe..04ca17cd4d1 --- a/debian/control +++ b/debian/control @@@ -14,24 -14,24 +14,24 @@@ Build-Depends: autoconf binutils (>= 2.37-9) [ppc64], bison, bzip2, - cargo [!alpha !hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mipsel !mips64 !powerpc !powerpcspe !sparc], + cargo (>= 1.85) [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !powerpc !sparc], clang [i386], + clang-11 [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el], debhelper-compat (= 12), - default-jdk (>= 2:1.9) [!hppa !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !powerpcspe !s390 !sparc !ppc64el !s390x !armhf !armel] , + default-jdk (>= 2:1.9) [!hppa !hurd-amd64 !hurd-i386 !s390 !sparc !ppc64el !s390x !armhf !armel] , dh-python , - dpkg-dev (>= 1.22.5) [armel armhf hppa kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sparc], + dpkg-dev (>= 1.22.5) [armel armhf hppa m68k mips mipsel powerpc sparc], flex, g++ (>= 4:12) [!i386], gcc (>= 4:12) [!i386], gperf, java-common (>= 0.75) , - javahelper [!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] , + javahelper [!armel !armhf !hppa !ia64 !mips64 !ppc64el !s390x !sparc] , - junit4 [amd64 arm64] , libabw-dev (<< 0.2~), libabw-dev (>= 0.1), - libarchive-zip-perl [!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] , + libarchive-zip-perl [!armel !armhf !hppa !ia64 !mips64 !ppc64el !s390x !sparc] , libargon2-dev, - libbase-java [!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] , + libbase-java [!armel !armhf !hppa !ia64 !mips64 !ppc64el !s390x !sparc] , libbluetooth-dev [linux-any], libboost-date-time-dev, libboost-dev,